core: add ETCS LOA logic to ETCS braking simulator #10316

Erashin · 2025-01-10T10:06:59Z

LOA logic (see Subset given in code): compute indication curve from EBD.
To do so, couple of technicalities:

EBD foot is not (targetPos, targetSpeed). It is a point after targetPos, (targetPos + delta, targetSpeed) so that the EBD passes by the point (targetPos, targetSpeed + dvEbi).
The indication curve reaches the target speed before the LOA: create maintain target speed curve until target position.
We build the LOA braking curves along the path, so that, same as EOA, we handle overlaps of the braking curves. However, we must handle intersections differently, since here, the LOAs don't all have the same target speed. To do so, build the LOA braking curve into the envelope at each step, so that it is used as a ceiling for the following LOAs.
The indication curve positions can all be negative, if the LOA is close to the path start: handle the case so we still add a maintain speed from the start of the path until the LOA (second screenshot).

codecov-commenter · 2025-01-10T10:28:58Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.76%. Comparing base (ec18e08) to head (e93a30e).
Report is 6 commits behind head on dev.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev   #10316      +/-   ##
==========================================
- Coverage   81.78%   81.76%   -0.02%     
==========================================
  Files        1073     1073              
  Lines      106492   106492              
  Branches      727      727              
==========================================
- Hits        87095    87076      -19     
- Misses      19358    19377      +19     
  Partials       39       39

Flag	Coverage Δ
editoast	`74.14% <ø> (-0.06%)`	⬇️
front	`89.36% <ø> (ø)`
gateway	`2.18% <ø> (ø)`
osrdyne	`3.28% <ø> (ø)`
railjson_generator	`87.50% <ø> (ø)`
tests	`87.05% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

eckter

Nice job! I only have some minor comments.

I haven't double-checked the formulas as much as I'd have liked to, it's quite difficult to get familiar enough with the reference doc.

Do you think we could add some asserts here and there? It would be valuable in this context.

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt

bougue-pe

Did not review LoA precisely (will do even if merged, improving late is better than nothing on the matter).

It's OK to merge IMO as long as we can hand-test this, and as long as it doesn't break "normal" braking. So please do if I don't have the time to review LoA before the deadline 🙏

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt

Signed-off-by: Erashin <[email protected]>

…envelope Signed-off-by: Erashin <[email protected]>

bougue-pe

Nice, and the simplifications you did here and there are very welcome 🙏
We may dig a bit on mutualizing the code... Let's see how it goes with SvL!

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt

github-actions bot added the area:core Work on Core Service label Jan 10, 2025

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch from b0ec3e8 to ba9f038 Compare January 10, 2025 10:24

Erashin changed the base branch from dev to alch/core/etcs_use_physics_path January 10, 2025 10:25

Erashin force-pushed the alch/core/etcs_use_physics_path branch from cb6893a to bbbd885 Compare January 10, 2025 17:15

Erashin linked an issue Jan 13, 2025 that may be closed by this pull request

core: ETCS: implement LOA braking curves logic #10330

Closed

Erashin force-pushed the alch/core/etcs_use_physics_path branch from bbbd885 to 6d85230 Compare January 13, 2025 09:29

Erashin mentioned this pull request Jan 13, 2025

core: implement etcs braking simulator for EOAs #10014

Merged

Erashin force-pushed the alch/core/etcs_use_physics_path branch 9 times, most recently from 41c408e to dff72ae Compare January 15, 2025 08:29

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 2 times, most recently from 7e31c30 to bbbab6f Compare January 15, 2025 09:28

Erashin force-pushed the alch/core/etcs_use_physics_path branch from dff72ae to 6fe9bff Compare January 15, 2025 09:34

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 2 times, most recently from f0eed6e to 556d53d Compare January 15, 2025 09:59

Erashin force-pushed the alch/core/etcs_use_physics_path branch 2 times, most recently from 3adb1dc to 61f6cc8 Compare January 15, 2025 10:43

Base automatically changed from alch/core/etcs_use_physics_path to dev January 15, 2025 11:21

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 3 times, most recently from 1998907 to 9f86660 Compare January 16, 2025 09:55

Erashin changed the title ~~core: add etcs LOA and SVL logic~~ core: add etcs LOA logic Jan 16, 2025

Erashin changed the title ~~core: add etcs LOA logic~~ core: add ETCS LOA logic to ETCS braking simulator Jan 16, 2025

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 5 times, most recently from 5bfa910 to 8350dfe Compare January 16, 2025 11:18

Erashin marked this pull request as ready for review January 16, 2025 11:21

Erashin requested a review from a team as a code owner January 16, 2025 11:21

Erashin requested review from eckter and bougue-pe January 16, 2025 11:21

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 2 times, most recently from 7a7883b to 655a2f2 Compare January 16, 2025 15:34

eckter reviewed Jan 17, 2025

View reviewed changes

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 2 times, most recently from 785ca9c to f95b0b1 Compare January 17, 2025 13:50

bougue-pe approved these changes Jan 17, 2025

View reviewed changes

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt Outdated Show resolved Hide resolved

eckter approved these changes Jan 17, 2025

View reviewed changes

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch 2 times, most recently from 2d5c58d to 5fd6dac Compare January 17, 2025 14:46

Erashin added 2 commits January 17, 2025 15:46

core: add etcs loa logic to etcs braking simulator

4dc1a17

Signed-off-by: Erashin <[email protected]>

core: remove etcs logic from const braking curves logic in max speed …

e93a30e

…envelope Signed-off-by: Erashin <[email protected]>

Erashin force-pushed the alch/core/add_loa_svl_etcs_logic branch from 5fd6dac to e93a30e Compare January 17, 2025 14:46

Erashin enabled auto-merge January 17, 2025 14:50

Erashin added this pull request to the merge queue Jan 17, 2025

Merged via the queue into dev with commit 9de1a14 Jan 17, 2025
27 checks passed

Erashin deleted the alch/core/add_loa_svl_etcs_logic branch January 17, 2025 15:46

bougue-pe reviewed Jan 20, 2025

View reviewed changes

Erashin mentioned this pull request Jan 20, 2025

core: clean up etcs braking simulator #10440

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: add ETCS LOA logic to ETCS braking simulator #10316

core: add ETCS LOA logic to ETCS braking simulator #10316

Erashin commented Jan 10, 2025 •

edited by bougue-pe

Loading

codecov-commenter commented Jan 10, 2025 •

edited

Loading

eckter left a comment

bougue-pe left a comment

bougue-pe left a comment

core: add ETCS LOA logic to ETCS braking simulator #10316

core: add ETCS LOA logic to ETCS braking simulator #10316

Conversation

Erashin commented Jan 10, 2025 • edited by bougue-pe Loading

codecov-commenter commented Jan 10, 2025 • edited Loading

Codecov Report

eckter left a comment

Choose a reason for hiding this comment

bougue-pe left a comment

Choose a reason for hiding this comment

bougue-pe left a comment

Choose a reason for hiding this comment

Erashin commented Jan 10, 2025 •

edited by bougue-pe

Loading

codecov-commenter commented Jan 10, 2025 •

edited

Loading